Move all coredata into Storage class