This is in the works (folders as you suggest.) It won't be available in the 2.0 release, but probably shortly thereafter, in 2.1.