Code cleaned and new packages