tweaking folder structure and adding Graffle templates