Reorganizing directory structure for development