Added new folder tree and several new functions.
Merge remote-tracking branch 'origin/master'