This patch renames diy to sdiy. It modifies diy itself,
renaming diy namespace. Also installs our embedded copy of
diy into sdiy. this should help isolate us from others who
embed diy.