Moving DB model classes to appropriate places