Some File Structure Changes