Rearrange helper dll structure