File Structure Fix