refactored dirs