Move NetConnection + Adapter to util
Autoformat