Updated to new cppcomponents. Removed unnecessary files