Minor doc updates, Kubota-san asked for a small change to EncapsulateMC

Also did some directory restructuring.