Cleaning

Cleaned up controllers and models
Release 1.0