moved classes to support pkg
Merge pull request #141 from anilsaldhana/master

see comments