Merge branch 'production' into dev
re-organized and eliminated cross-module dependencies
Merge branch 'production' into dev
re-organized modules ; easier to test
Merge branch 'dev' into production