Changing default routing setup.
Remove extra line.
Tweak default request setup.
Working on structure.
Remove scan arrays.
Merged with upstream

Signed-off-by: tyloo <jbonva@gmail.com>