Replace enum struct to enum tuple
Add util.rs (but it's conflicted)