Update to new layout to remove circular dependencies.