lots of stuff: cleaned up router, organized structure, wrote classes.
Merge remote-tracking branch 'origin/master'
moved scanner to views