Rework resource types

Headers and responses on resources should be closer to correct now.