Module import, reorganization of builtin modules