Made some overall folder changes

Changed folder names and what not. The riskiest commit.