Fix bug where current page was not selected.  Move server code to its own directory.