Re-organization and cleanup for ease of use in shield studies