refactored object structure, changed interfaces classes and mappings
removed duplicate / unnecessary functions
Merge pull request #23 from sjopet/struct

refactored object structure, changed interfaces classes and mappings