Following consensus in #239 (closed) I am removing the splits. Fortunately in meantime there have been no changes in these files which would need to be carried over. I simply go back to these commits: