Extract split boundaries part into separate module.