Reorganizing config