Removing "Client" sub-hierarchy, moving all to top level. Removed several platform specific code.