Restructuring and testing.
Bumped version.