Code corrections
Add simple test router
Rrefactor structure