File structure reorganization.