Prepare for subtree splits

Signed-off-by: Kevin Simard <kesimard@outlook.com>