Sorted all classes into packages. Renamed typo class "controler" to
"controller"