Investigation generals moved to criminal courts