Library project

Merged and ready.