Remove cruft, and update path refs ('wordpress' instead of 'wp')