Reorganization and testing