Finalized major reorganization

Rejigged all the tabs and what should be where.  Just need to make sure all the data is correct... but how?