Modifying folder structure
Modifying folder structure.