Moving model classes - minor tweaks