initial folder reorg #11

Closed
codedude wants to merge 6 commits from (deleted):r9 into r9

6 commits