[BREAKING] Rework wrapper package structure