Moved files to allow a better merge with upstream