Multi site from sub folder cannot login

Hi
We recently created a wordpress site for our main domain, as we have a few other wordpress sites which are running with their own wp installation we installed the multisite with view to adding these later.

The multisite was installed in a subfolder /wp and we built the site. When it came to making the site live I tried set it up to run from the subfolder. In multi site this is more complicated than in single site but I found the following instructions :https://wpengine.com/support/how-to-change-a-multi-site-primary-domain/

Following these (as I understood them) and copying the .htacess, index.php and wp-config.php files to the root folder the site now displays at our root domain. However I am unable to login to edit the site. Both https://www.enjoymeditation.org/wp/wp-login.php and https://www.enjoymeditation.org/wp-login.php show the login screen but both return incorrect “username or password”

Are some different changes needed to login?

The fields that I changed were:
index.php ‘require( dirname( __FILE__ ) . ‘/wp/wp-blog-header.php’ );’
wp-config.php tried both ‘define(‘PATH_CURRENT_SITE’, ‘/’);’ & ‘define(‘PATH_CURRENT_SITE’, ‘/wp/’);’
wp_options change site url from ‘https://enjoymeditation.org/wp’ to ‘https://enjoymeditation.org/’
wp_site change path from ‘/wp/’ to ‘/’
wp_sitemeta change site url from ‘https://enjoymeditation.org/wp/’ to ‘https://enjoymeditation.org/’
wp_blogs change path from’/wp/’ to ‘/’