Last refactoring step. Adding packageName to docker and universal
plugin.