Sorted out the file structure for the resources, and fixed up the rest of the menus.