Restructured primitives package