continued reorganizing the app