Model refactoring

Change class namespaces