Correct files organization.