Refactored directories