Extreme refactiorng, asset overhaul