Update classes and structure of application