fixed jetty logging, simplified some files, move some files