Router updated

Router updated to support pages in folders instead of hyphen seperated