Added routing and templates
update
Merge pull request #8 from dxn7335/Develop

pull from Develop