Reorder directories.

git-tfs-id: [https://tfs.codeplex.com:443/tfs/TFS15]$/Atomix;C42122
Remove old directories.

git-tfs-id: [https://tfs.codeplex.com:443/tfs/TFS15]$/Atomix;C42123