Renamed unrefactored code dir and refactoring plan