Re-arranged gui directory location and cleaned up Makefile.am
Moved GUI directory to a more logical location