Removed most of the reudndancy between the debugger client and server directories