cleanup after split
Make more interface public after split
Restructure for split
Cleanup