Factor out DockModule struct, remove some logging