Re-arranging API folders