Takenbundel 1.5 Refactoring