Enhanced API Structure & Renamed it