Cleaned Up The Models And Repositories

Note that this pull request doesn't actually namespace the models, just cleans them up.