Revert "Move to Data"

We have a system app remover... not a data app remover.... wwwhhhyyyyy??

This reverts commit fa3fcfe05a4e8a1103e14d5bfb1bfd62b9e3f5ba.