cleanup/re-org to make it easuer to seperate our source code from the ccnx distribution