renamed Resource to ResourceController and cie