Refactor Api files to single Actor.api