Rearrange dirs

Merge into rearrange_dirs, contains the new DAGMC