Changed pull-config and renamed everything so it's easier to type