Cleaned controller and introduced the Integral part in the controller.
Renamed files. Enum of states.