Revert "Changed how data is stored"

This reverts commit 3cbfbde0718a089bd1d4ec1dd4bb3e2217908113.