Updated the app file structure and architecture.