Added an importer and restructered the database a bit