Consolidating Submissions and Uploads

Unifies the two separate tables to make a big table that can have files
and written text together.
Code Cleanup