Restructured the module system again