Renamed apps to webapps and added services