Fix everything
Fix the client and server apps
Fix the client and server apps
Remvoe from wrong directory