moved cherrypy dependency to modules. Fixed up modules state