Moved movement methods to a proper class