Rearranging for ease of structural coherance.
File markers.
Renaming elements to less ambiguity.
cleanup.
Working on table gen proper.