Correctly reoganized with git