renamed local packages. extracted completion blocks