Better packaging

Just a repackaging for ready to pick and install via urls and/or Composer. Added also updates to controller.php from mathiasverraes@6522961