Add in data server folder, organize files