Refactor RemoteAdapterFactory (extract adapter build to builder classes)