Implemented Filesystem folder expansion.
Removed cm:folder extensions.