Reorganize and simplify overrides, loader and direct definitions.