reorganizing images and better managing structure