That's an old stuff which I want to avoid touching in this PR.

This one is just moving it into the same repository.