Added functionality to create free matches/moved classes to domain/gui package