Renamed apps to modules