Library - step one

Moved some structs