Split into new cpps and .h