Refactored GUI package

The package was getting to cluttered before, looking at the file list
was giving me a headache…