added Added class, re-org files
Merge branch 'master' of https://github.com/streppneumo/isp