refactored to client server folders