Revert folder structure, in favor of websslyze setting sys path, removed some redundant OO for json and xml output