refactoring: moved model classes into subpackages