Restructured the whole project to use HMVC structure