Clean up empty classes
remove old files
Fix ref to result-model
Merge pull request #144 from nickb1080/class-cleanup

Class cleanup