Basic models and template controller implemented, Cleanup.