populated database (plus file structure cleanup)