r7166: Move replacement stuff to seperate directory