Revert "Revert "File structure""

This reverts commit 67ee04c5bb50c6f4371e286b9fa1bf1642322554.