Added DataStoreFS and corresponding tests.
Some project structure refactoring