Reorganization and cleanup