Structure reorganization