Refactoring, create App classes and create standalone_trickle_up class