Reduced one level folder nesting and added some classes to first draft the db data model. No further work on the DB until an initial ER diagram is set