Correct file organizarion.