Changing module structure to remove inherits