rework tree to separate dev and dist