Updated so all the GUI goes into a GUI package