refactoring to fix directory names