Renaming the class names and cleaning up code
Adding interim sample/test