8055188: General cleanup of minor issues from source restructure

Reviewed-by: tbell
22 files changed