refactoring albums directory