20141111 - Folder system simplification.