Simplify folder structure
Simplify folder structure