Updated

Mexico's president-elect is proposing a government reorganization that would put the scandal-hit federal police under control of the department responsible for domestic security.

Federal police are now part of a free-standing Public Security Department. Its chief, Genaro Garcia Luna, has deep ties to many in current President Felipe Calderon's administration.

Calderon has touted the federal police expansion as the centerpiece of his war on drug cartels. But in June, two officers fatally shot three colleagues at Mexico City's airport, and authorities said the shooters were part of a cocaine ring. Then in August, a group of federal officers shot up a U.S. diplomatic car, wounding two CIA agents in what officials say was a deliberate attack.

President-elect Enrique Pena Neto wants Congress to move the police into the Interior Department.