Rearranged folder structure for PNG and JPEG libs - updated