Updated for 2014 July release

Also change directory structure from crossmap to map as per new packaging structure