Moved Round class to a separate file