Moving more implementation to .cc files