After final dir refactorization2