Directory reassignments

To make server sync easier for the time being