Fix: Some re-factoring based on Redmine Standards for views / controllers / hooks segregation