trim some more fat and consolidate resource classes into Resource.h