Add server, change file structure