Moved model classes to model sub directory in package