major design revision, some parts re-org, plugin updates