Some repackaging.

( due to throughseeness, thx to Kohlmann. )