Revert package hierarchy