feat: merge in the server code - to unify repos

[jdshaeffer]

per @clarkshaeffer's suggestion, going to unify the server and web repos to simplify our process, should be a minor refactor at this stage