Reduce the amount of branches + some rework

[WizardlyBump17]

There are some branches rn that should not exist; 1.20.6+ and spigot+1.20.6+.

spigot+1.20.6+ should be merged on main.
1.20.6+ should be renamed to paper and it should be similar to the main branch