Refactoring package names and README