Spliting rewrite files into a separate branch