reorganize some things to straighten out the site url structure