Major clean-up: we now have proper[-ish] application/environment files and a few refinements to Regexp & String