Reorganizing application