Changed the project structure

Changed the project structure
Changed the structure

Changed the structure