Restructured resources files for 1.5