restructuring directory structure for dev branch