Fix File Structure