rearranged a bunch of stuff for distribution, builds