reorganizing everything