reorg bootstrap folder. major edit to env for mac compatability
merge sucess