Module rename and package re-org.
Other small updates related to implementing wizard validation.