Refactor OAuth Access and API Structure