Restructure
Fix indentation
First steps to fixing this travesty
Better pathing
Fixes for live
Merge pull request #1 from jspc/rm-rf_redo

Rm rf redo