Refactor the refactorings organization to fit with new modern