refactoring with Noppe
reworking directories