#4 move to one folder
Fixed #4