Moved files to gui package