Merged rest of old package.

Merged remaining definitions from old lunette package into the new one.