update o n new structure

needs tpo refactor to compilable state
update hv submodle version