Improve folder structure
Improve folder structure