Reorganizing project structure