Fixed bug in ClientReceiver
Reorganized the entire project