Refactored FileStorage for better persistence

Fixes #36