Changed to self-contained package.