Finish refactoring to be standard in directory settings