Package refactor moving toward separating the framework from the app.

the actual app.