Fix dependency structure: move classes from models to models.core

per the request of @TheBizzle