Restructure package hierarchy