Reorganize by language/type system.