Want to merge WIP-RootDirStorage into master to implement new dir for all stoed files. Also added store features for categories.