Refactor
Parse v2 packages