Included Fretta and re-organised directory