More library moving

Meant to push this earlier today, but got distracted making the spreadsheet...