reorgani(s|z)ed package structure