File structure reorganization