Got rid of Client and Server

they didn't work. fuck.