Upstream fixes + file moving