Improve class naming, update README