Recreate file structure

Recreate file structure