Moved classes to new package and renamed a class
Changed GUI