Some chages to folders