Updated content headers, and moved libs/ readme
Merged fixes for bug #4