tweaking file and folder structure