Some MAJOR refactoring - splitting EnvSimple out into its own package