Add folders
Improved code