Reorganize pump stuff