Separation of Controllers

Separated session/template and general REST ctrl.