Changes to make gui work in new directory structure