kiwi added. remove useless files. bug fix.