Add in client adapters and move base classes to root