Added Namespacing and created MVC for modules