rewrite: merge in some more litenull stuff & delete the superfluous files