Massive cleanup and reorganization