merge filestore functionality into web server