Refactor GUI to use files from Core