Change directory structure to match master