Remove header
Marge lib/ into single library