Merge pull request #105 from apache/directoryMoves