fix: missing group
added empty dirs support