Using 2 separate folders for N7 devices/rename