improved the header file structure for importing the library