Moved two more classes into GUI source folder as they were using Swing.