Package config file generation improved
Main header files renamed
Unneeded inclusion removed