Updated the app Structure