directory structure rebuilt, stage 1