Reorg samples. Need to do final 1:1 comparison of jarfiles with Ant output, just to make sure I haven't missed anything around the edges.
112 files changed