Moving model to own package