Moved modules under views folder; added ability to add custom controllers for modules; added ability to merge models