Starting django app reorg
Removed cruft
Added more tests, some cleanups