refactored directories