Remove duplicated class defintions
Merge pull request #1 from dirkschulze/avoid-class-duplication

Remove duplicated class defintions