Restructured MetOffice code