REFACTOR packages and README