Refactored the database reader.
Each section of the file now has its own reader.