Cleaned up some of the new TupleUtils functions
Moved around some files and cleaned up code