Reorganization and optimization