Reformat everything into a better project structure