Converting to match cs-webapplibs v0.6+

This is an intermediate commit.  Work is still on-going.