Fixing some @todo
Make headers look similar
Renamed client{,_main}
Fixing client.h -> client_main.h