Reorganized to match other ckanext's