Include images folder and fix some references