Moved the FileStore to FileStoreService