Use a concept-specific package.
Introduce the relations between concepts.
Refactor + simplify + document the sample.