TUP-2107 Refactor Updates

About the refactor updates, need merge and validate to master.

the p2 bundle should be located in some EE features not TOS features