Rename lock_file -> sudo_lock_file to avoid namespace pollution
Move src/po -> po Combine common and compat -> lib/util Move zlib -> lib/zlib