Restructure the first version.
Incorporate new prcessing options.