Started the prep for July 2nd

Cleaning up the project and adding more folders to make it more clear
what does what