Update readme and help text
Refactor class and file names