Changes to get the GUI working again in the new directory structure.