Library - step one

Moved some data.