changed naming on topnav and subnav
more naming fixes
Merge pull request #23 from LauraHilliger/gh-pages

Renamed modules