Change in the interface to improve function names. Module rename. Code cleanup.