reorganize and ring server. not fetching json
remove old files