Performance improvements, reorganization of folder structure and preparation for implementation of user interface