Move companion objects to separate package in order to reduce clutter in exercises
Rename heavy work to risky work