reorganization - manual packages