Moving generators out of /generators