Reorganise DNS files to get rid of duplication and use a makefile to