Uniquify base directories
Merge pull request #155 from eagletmt/unique-base-directories

Uniquify base directories