Spring cleaning

Rearranged the file structure