updating modules to be properly namespaced