Moved all other libraries onto properties of lib