Changed modules to namespaces