packahe.json updated
A little bit od refactorins...?