BS-9367, reset gateway that are failed
change folder names to be more understandable