Minor restructuring of java bot files to allow for generic classes
Update main launcher to use new classes for command line and gui interfaces