Finally the foundation
Refactor, moduled! API calls