Relocate and somewhat fix-up hll