Moved a couple of files from stools to spipe.  Fixed a minor problem when parsing map elements.