Merged the server and server2 folders.
Specifically ignoring broken tests. Related to #250.