May 29th Changes

Filestore is history and dependency on store module is removed