moved newly created classes to new namespace, rename the old model classes