Fix some Hadoop functions, refactor so it's easier to find stuff
Oops add the new modules