Added a new structure for the app