Reorganize code in sub modules
Fixed interference with jetty about page