Reorganizing everything