tidied the app's structure