File sturcture reorganisation