Add Empy Folders, Fix Image on Prepare Step