Moved UI classes to their own package to make it easier to see code coverage of main code