Move modules to their own namespace