Finished merging the website into one site