Move Connamacher's provided stuff into a lib directory