Added Folder Icons.
Some cleanup.