moving all model classes to the main packages