Change package hierarchy