Unify apps

This fixes migrations and will prevent future issues.

---

- [x] Tests pass
- [x] Migration works
- [x] DHCP build process is unaltered