Started rationalizing directory structure (this will temporarily break things)
Corrected code to account for previous change
Fixed more glitches resulting from renamings
Renamed data to backend