Moving hadoop version files to correct location
Various fixes