Moved all framework activities out of sample app