Minor cleaning and reorganization
Upgrades: jpeg-9->9a libpng-1.6.6->1.6.10