New Architecture

Archictecture changed. A lot of views and controllers are not working
now.