some folder reorganisation + jacob's example added