Cleaned up the structure of the project, or at least tried to. Made it more nested.