Revert "Revert "edit file structure""

This reverts commit 187e2ffafcef1d48b2da0e7a9a195289cfbd5fcc.