Restructured the API Wrapper in a separated Library