Move EnvironmentVariable class outside service namespace

Environment variables are not a service