package refacoting and README update