still continuing separation of gui and data and file reorganisation: