Database Re-organized

Columns rearranged to fit the design in Repository.cs.