PLD: move packages into onadata apps dir