Reorganized files
Changed the structure of the project