Added client and server meta, renamed classes, lots of changes