Move resources for 5.3 compatibility?