moved core model classes to an appropriate package