Full directory restructoring