introducing a module system and migrating certain commands to the module system