add buildhive + begin refacto