Fixing the directory structure