Code refactoring and renaming
More refactoring
Correcting test cases after the refactoring
Correcting pkg-config file