Moved things into /lib