Renamed and refactored files related to FileStore database