reorganised some files