folder types, and changed all the components to work with the new setup. svn path=/trunk/; revision=3199