Moved Tuple stuff to functional java library