re-organise some files structure