Refactor app ext

I'll version bump when the application PR is pulled through.