repackaging

finally i did the repackaging. please merge as soon as possible