Renamed folders and app name