added hazards and reorganized directories