Oy. Bigger change than I normally like - but this stuff is all intertwined. Moved a bunch of things to public drizzled/ area. Split some files. Made some convenience libs. EVENTUALLY, some of this will be able to be re-factored, but for now I'm ok with erring on the side of too many files.