Split datastores into modules