Make revisions to the Router & Application classes, add Service back into the main repo