Refactored the project structure so it's a better (and easier to search) hierarchy, and removed redundant parameters from several of the models.