Remove seperate webtier and update to latest modules