Significant restructuring, Added "Final" path

Nothing should have broken, I have tested it extensively, but there are
still holes I am aware of.