API Restructing

More elegant naming conventions for API methods,