Updated and refactored the data conversion utilities. Updated/simplified the database meta/data.