Added server logic and moved client to appropriate folder