Refactoring as stand alone module