Reworked API toward a more RESTful experience
Fix naming conflict
Reworking on import