Begin refactoring GUI classes