Improved File Structure