Complete restructure of the app