Added packages and added client/server directories