Add in data server folder, organize files
removed trash files