Reorganizing project structure
Project reorganized