clean-up folders structure - follow up

Closes #43