Replaced namespaces with a module system, and more