Reworking library structure and usage.