first draft of setup

reorganize, start build setup

minor tweaks to setup