Fixes merge conflicts related to the previous merge and adds/moves some missing files.