Spring Cleaning

I moved around the classes to make them look a bit more organized.