directory restructuring, preparing to deploy