Added namespaces to the modules