Moved everything to cpps and proper headers.