Repackaged

core stuff importable directly from module root