Refactor and move .helix