Dir refactoring for Composer