Expand README and improve naming conventions