Fixed folder organization.