Restructures some classes. Added methods/stubs to initiate V2 wrapper implementation.
Merge pull request #1 from mchernyavskaya/master

Tried again.