Updated File Structuring