got rid of client / server folders