Moved the UI classes into a separate package