Restructures some classes. Added methods/stubs to initiate V2 wrapper implementation.