Moved Square class def to its own file