Revert "merge into single file"

This reverts commit ca592a3a8913a0cc6269c28d96fac4eca3b087e4.