Code Refactoring

Add Router and Templates