Refactor upmp package