Added data folder and proper settings