Refactor GUI and CMD java files for more consistent use
Refactor to use new Command-line runner
Checking to remove redundant code and refactor GUIs to use new package layout
Refactor command-line java files for use with new classes