Consolidate the dirs

Oh my...