refactored images into folders