Added support for the new distribution structure.