file structure refactor
Refactor file structure