Scala Collector: Refactor directory.
Thrift: Add scalacheck tests. #451