File Structure fix