XD-2149 cleanup directory structure