Some cleaning, img folder added