Update: changes to gui and architecture structure