Refactor and integrate acid-io project