I would also suggest to tag the current state after we added the license headers and then start refactoring.