Rename
moved #define's to one place
Router

Update readme