Changing name to the classes, integrating the library in a single file and bug fixing