Issue #161 - Remove old classes and add a demo application uses for unit tests