Major reorganization for both framework and apps