progress towards #14
moved builder classes
fix
moved file
added backoff when reconnecting