Moved Tuple classes to separate package