Reorganise the folder structure to be similar to what was done with the main fofix repo.