Some organization of code#7

alaczi wants to merge 2 commits intojhfrench:masterjhfrench/bootstrap-tree:masterfrom

alaczi:develalaczi/bootstrap-tree:develCopy head branch name to clipboard