Version 2.1: Change in directory structure

With the latest change in CMake to support the installation of the library, it became apparent that the include needed some refactoring.

This will break the code of people using the previous version, sorry :(

Bear with me