Represent sets and maps as subdirectories

This removes the s-expression encoding from the database

Signed-off-by: David Scott <dave.scott@eu.citrix.com>