How did you move WordPress to the "wp" directory? You can just move them via FTP. You'll need to follow the directions here:
Depending on your host, it may be easier just to ditch your current installation and reinstall WordPress. You should be able to use the same database.