BST prob
Restructured Folders, couple more solutions