[CPS] Re-structuring the packages for better understanding