continuing the transition to automake, also backing up stuff just in case