Refactor asked by one of the original contributors of the old project. It was not copyright infringement, however he has rights to ask.