Refactoring feature-step-organization (wip...)