Restructure tokens to be app specific