Changes to structure of the application