Renaming Api + abstraction (1)
Standalone version of API