Move src/po -> po Combine common and compat -> lib/util Move zlib -> lib/zlib
1 line continuation at EOF