Refactor class names
Simplify GUI and refactoring