Help needed with siteurl and the mess I made :)

Wanted to remove the location folder of wordpress showing up in the adressbar.
Used a tool online at surftown.dk which should move the wp installation to the root.
Nothing was moved, but a rederict was made, and the adress/wp/page was changed to adress/site
Super!! ??

Before I had wordpress on my site I had a html site, and all of the files I have deleted.
But then I tried to access one of the old html pages, and went up with a 404 error.
On that site, there was a link to the prontpage of my wordpress site, but pushing this link, also gave a 404 error.

Therefore I went to the settings general and added /wp to the end of siteurl. Then everything went wrong.
404 I could log in again, and the site was without theme..

I found a solution and added

define(‘WP_HOME’,’https://thilqvistoptik.dk/wp/’);
define(‘WP_SITEURL’,’https://thilqvistoptik.dk/wp/’);

to the wp-config.php and removed

update_option( ‘siteurl’, ‘https://thilqvistoptik.dk’ );
update_option( ‘home’, ‘https://thilqvistoptik.dk/wp’ );

from the themes fuction.php

the site was looking ok again, and I was able to login.
But then I had the adress/wp/page in the adressbar again..

The wp files still content in the folder wp, but I can use both with and without wp/ in the adressbar.

Now my question.

How to move every wp file and folder to the root of my domain and how to change the wp-config.php and function.php and everything else, so i works without the wp/ foldername in the adressbar and siteurl
I think I have made a real mess and now I have to “clean it again”
Where to start??

Best regards
Palle

https://www.thilqvistoptik.dk using Falco theme