Move to same hadoop package to clean up the code