Restructure package definition