Reorganize directories: scala.
Update add c4 directory to global include dir.