Renamed folders for clarity
Started work on new models for mongo