* Merged a few files to make the library more compact