Reorganize a bit
Comment and reformat module module
Bad EOF
Fix exceptions, add module refactor
Fix json dumps
Merge branch 'webserver'