Move APIs to the proper place