Restructure API Key API