code formatted
model classes to new package