simple re-organizing