Move Code Duplicated between apps to shared Project

[aaronmgdr]

Consider moving shared stuff to another folder that can be use by both?

But not if we need to publish a package for it to work.