Merge - web module correction

Web modules that don't belong in the web/addons folder were moved