- Refactoring of folder
- Added new unit tests