Reorganization of the project + Add missing pkg_config lines
Modify include sequence in order to prevent compilations error