made overrides and module loading work with new structure too