Completed refactoring to complete 2.0 release candidate.