Move module and add a bunch of debugging infrastructure