Refactor, renaming and README