Files now well arranged