Moved out old code.  Renamed active code.