Refactoring (Moved previous GUI code into client package)