Reorganise file structure to reflect the logical structure more closely