Restructured helper classes
Restrucured all controllers