Restructured code for major conversion classes.
Bumped version.