More refactoring; Renamed the library