Colocation

Maintainability through colocation