Some more package reorganization