Added some refactored GUI class files