Moving directory structure around to keep the root from getting too cluttered
Authored by: m0slevin 2014-03-22
Parent: [r165]
Child: [r167]