Refactorized image names and cleaned img folder