After final dir refactorization3