Resources: cleanup and reorder