chnaged the server structure and added namespaces on classes