Ruxi: Reordered the client folder.