split base and normalize partials

[ci skip]