reorg and prep for new npm packages