Storage

Did some clean-up.
Working on encryption and storage in Storer and FileData.