directory structure corrected