Feature/template controller organize