Merging the CP based changes with the new package heirarchy
Moving the CP based files to new package structure