Directory name refactor