Refactor to build with cargo