relocated some files to make GUI work