Restructure package layout