reorganizing structure of app