Cleanup - Refactor model classes into their own package.