Directory structure corrected