Fixed some URLs, deploy to website, moved files around