organization, prep for sqlite build
More setup/reorg