Remove redundant app_dir and replace data_dir with app_data