moving common code to web-apps-common