Rename main folders, add PNGOptimizer to tools