Rearranged Database file

moved order of tables and queries around to make more sense and be more
readable.
Merge branch 'Alex'