Moved class to route Module