Added more lib files, both headers and source