move objectstore out into its own module