File structure reorganisation