changed some files tofolders, organize