reorganizing directory structure and project name