Foundation wrappers and misc. cleanup.
Industrial projects normalized.