This commit also drops the patch that has been included in the updated version, and adjusts to new directory structure in the archive of the updated version. Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>