Basic Auth Incorpored
Merge
Router Refactor