updated TODO
moved server into server2
renamed server2 to server, removed server (old)