Changes to folder hierarchy and naming of some gui components