More sane structure for library overall.