Tidy up files nd updates router branch