Knotix refactoring