A core package seems nicer. Less clutter in mechanics.