Updated server folder structure to match client.