Spring Cleaning

Cleaned up the folder structure.
Removed unused files.
Removed references to unused files.