Initial work on reorg into classes
Bring in changes to tar and util
Move under packaging