Reorganizing activity and application inside sdk.