changed the entire structure of the app