Fixing File-Structure: Step 2

Readding everything