Moved server and client to separate folders