Changes in directory structure not represented in lots of files. Fixed that.
 Also Cherrypy seems to be eating URL fragments so a RP based on Cherrypy can't handle return_type other then 'code'.