latest changes to more closely follow current manifest/module structure