Re-organising the files