trying to reorg to work with pip...
reorg for pip