refactoring images and images folder