refactor Hadoop1 modules