Move core into separate folder
Add json storage