Added bokeh requirement
Add supervisor entry for bokeh
Clean-up directory structure