Move Model classes into there own package under core

Moved the model classes into there own package under core