Directions refactoring complete