Doing some clean up and breaking out the gui source code into modules