Move models into models directory
Fix references to models
Move models into models directory