[General] finished work on new folders model (issue #44)