restructuring repo + reference to forked rivets