Restructure as of upstreams new layout, to make merging possible.