Move method refactoring
Move factories to different namespace refactoring