Revised File Structure