More package reorganization