Merge "Changing the structure under plans/ccsdk"