move storage wrappers to their own namespace