(feat) Separate data from server file