Updated Namespaces and folder structure to reflect module name