move server to web directory
merge