Conform to REP-127. Also add new pkg to package.xml