Redo app folder structure & change cache path for dev environment