Revert to before "package" layout was used.
Fix conflicts