Reorganized structure of app.