Save to data folder and simplify saving