Scala Collector: Refactor directory for #446.