Changed the strcture of the application.