Restructure to fit dfm convention