Update organization and introduce transformers for API
Update templates and tests to match new organization