Refactor/directories