Move code into elk module

[norabelrose]

This makes it easier to directly look at git diffs between the two