Reorganising file locations because TWFY