Reorganization and cleanup- moving magics to be a subpackage of powers.