Move data out of main library