some changes to file arrangement of uzi