Move environment_variable files outside service

Environment variables are not a service