refactor directory tree
removed dupes in <li>
Merge branch 'master' into gh-pages