This is a first step in generalisation of the project. Please review https://github.com/JeroenED/libpairtwo/wiki/Converting-your-code-to-the-generalized-format for more info on your code changes