Refactored FileStorage for better persistence
Updated testing environments
Merge pull request #37 from stekycz/feature/file-storage-refactoring

Refactored FileStorage for better persistence