small dir refactoring