Some major rearranging; passes build-check cleanly
new tracks