GUI Updating

Changing file names to be more logical