lib: added header files and changed method names for better recognition of their source files