Storage engine refactor WIP
REMOVE ALL OF HADOOP (should reverse later)
REMOVE TESTS (to reverse later)