Move all storage into separate file