[OnDemand] add 4OD, and cleanup, and use new commons library.