reorganize files to separate server and web