Refactor the way it should be (I need to use git mv)