Next step in refactor

Still need to get Sample Apps building/working