Reorganize packages, update validation and company tests to reflect Builder changes.