Refactoring: Refactor Dir structure more.