Some refactoring in personal packages.
Preparing for Krumbliverse annotations.