Reorganizing project
Finished reorganizing files