reunimport some directories. Hope I'm finally getting it right.