Rearrange to have lib/
Rearrange to have test/